From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 05:26:31 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=55dff340dfea1812fb55d27428ae708f094cb7a2;p=emacs.git

merge from trunk
---

55dff340dfea1812fb55d27428ae708f094cb7a2